bitkeeper revision 1.1236.1.49 (4226ddd3E_h9Dlj5W6XverRkiMcqMw)

x86 ( 32bit) is the only architecture that uses Fast trap vector offset
( fast_trap_idx ). This makes sure that x86 is the only architecture to
use this variable.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index 6eab54c98ee67e2ac2f2e387a56f7c31464754e7..1db6cfe69ddb4659136ee76cd2dcd7a92dc17977 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -433,7 +433,10 @@ int xc_linux_build(int xc_handle,
         ctxt->trap_ctxt[i].vector = i;
         ctxt->trap_ctxt[i].cs     = FLAT_KERNEL_CS;
     }
+
+#if defined(__i386__)
     ctxt->fast_trap_idx = 0;
+#endif
 
     /* No LDT. */
     ctxt->ldt_ents = 0;

diff --git a/tools/libxc/xc_plan9_build.c b/tools/libxc/xc_plan9_build.c
index 417cc780327ab6b73885e9169f10c6c97c55746f..4e81680fced870d7041eff4de6cfecebb2d91c85 100755 (executable)
--- a/tools/libxc/xc_plan9_build.c
+++ b/tools/libxc/xc_plan9_build.c
@@ -505,7 +505,10 @@ xc_plan9_build(int xc_handle,
                ctxt->trap_ctxt[i].vector = i;
                ctxt->trap_ctxt[i].cs = FLAT_KERNEL_CS;
        }
+
+#if defined(__i386__)
        ctxt->fast_trap_idx = 0;
+#endif
 
        /* No LDT. */
        ctxt->ldt_ents = 0;

diff --git a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c
index 382d87f9b3ff67b56ff1253af5de62e64b3983ef..2a7a9d016be9125377df7a037bd316ccf7e111ec 100644 (file)
--- a/tools/libxc/xc_vmx_build.c
+++ b/tools/libxc/xc_vmx_build.c
@@ -576,7 +576,10 @@ int xc_vmx_build(int xc_handle,
         ctxt->trap_ctxt[i].vector = i;
         ctxt->trap_ctxt[i].cs     = FLAT_KERNEL_CS;
     }
+
+#if defined(__i386__)
     ctxt->fast_trap_idx = 0;
+#endif
 
     /* No LDT. */
     ctxt->ldt_ents = 0;